From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Thu, 25 Apr 2013 19:45:53 +0000 (-0400)
Subject: userMenu: Use addSettingsAction
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4070
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=b68eb44ca56607df2a20cc5b60f740b88e42a1c7;p=gnome-shell.git

userMenu: Use addSettingsAction

https://bugzilla.gnome.org/show_bug.cgi?id=701755
---

diff --git a/js/ui/userMenu.js b/js/ui/userMenu.js
index 2a0a32345..86980c5a6 100644
--- a/js/ui/userMenu.js
+++ b/js/ui/userMenu.js
@@ -566,7 +566,6 @@ const UserMenuButton = new Lang.Class({
 
         let allowSettings = Main.sessionMode.allowSettings;
         this._statusChooser.setSensitive(allowSettings);
-        this._systemSettings.visible = allowSettings;
 
         this.setSensitive(!Main.sessionMode.isLocked);
         this._updatePresenceIcon();
@@ -742,10 +741,7 @@ const UserMenuButton = new Lang.Class({
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
 
-        item = new PopupMenu.PopupMenuItem(_("Settings"));
-        item.connect('activate', Lang.bind(this, this._onPreferencesActivate));
-        this.menu.addMenuItem(item);
-        this._systemSettings = item;
+        this.menu.addSettingsAction(_("Settings"), 'gnome-control-center.desktop');
 
         item = new PopupMenu.PopupSeparatorMenuItem();
         this.menu.addMenuItem(item);
@@ -806,12 +802,6 @@ const UserMenuButton = new Lang.Class({
         app.activate();
     },
 
-    _onPreferencesActivate: function() {
-        Main.overview.hide();
-        let app = Shell.AppSystem.get_default().lookup_app('gnome-control-center.desktop');
-        app.activate();
-    },
-
     _onLockScreenActivate: function() {
         this.menu.close(BoxPointer.PopupAnimation.NONE);
         Main.overview.hide();